merge trunk
authorK. Handa <handa@gnu.org>
Wed, 3 Jul 2013 13:29:39 +0000 (22:29 +0900)
committerK. Handa <handa@gnu.org>
Wed, 3 Jul 2013 13:29:39 +0000 (22:29 +0900)

Trivial merge